$OpenBSD: patch-configure,v 1.19 2016/07/08 12:59:13 sthen Exp $
--- configure.orig	Wed Jul  6 20:03:41 2016
+++ configure	Fri Jul  8 13:41:32 2016
@@ -4808,7 +4808,7 @@ $as_echo "no" >&6; }
 fi
 
 
-if test ! -e $CXX; then
+if test ! -e `which $CXX`; then
    as_fn_error $? "Unable to find C++ compiler" "$LINENO" 5
 fi
 
@@ -16699,7 +16699,7 @@ if test x$use_libtool != xno; then
    LIBTOOL_INSTALL_TARGET="libtool-install"
    LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
    LIBTOOL_CLEAN_TARGET="libtool-clean"
-   QMAKE_LIBTOOL="${BUILD_DIR}/libtool"
+   QMAKE_LIBTOOL="${LIBTOOL}"
    FD_PLUGIN_DIR="src/plugins/fd"
    have_plugins=yes
 else
@@ -22362,7 +22362,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
 $as_echo "#define HAVE_READLINE 1" >>confdefs.h
 
-		    CONS_LIBS="-lreadline -lhistory ${TERM_LIB}"
+		    CONS_LIBS="-lreadline ${TERM_LIB}"
 		    got_readline="yes"
 
 else
@@ -22401,7 +22401,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
 
 			got_readline="yes"
 			CONS_INC="-I${TOP_DIR}/depkgs/readline"
-			CONS_LIBS="-lreadline -lhistory ${TERM_LIB}"
+			CONS_LIBS="-lreadline ${TERM_LIB}"
 			CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
 			PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
 
@@ -30736,6 +30736,7 @@ netbsd)
    DISTVER=`uname -a |awk '{print $3}'`
    lld="qd"
    llu="qu"
+   COMPRESS_MANPAGES=
    TAPEDRIVE="/dev/nrst0"
    PSCMD="ps -ax -o pid,command"
    PTHREAD_LIB="-pthread"
@@ -30754,6 +30755,7 @@ openbsd)
        platforms/openbsd/bacula-fd \
        platforms/openbsd/bacula-sd \
        platforms/openbsd/bacula-dir"
+   largefile_support="yes"
   ;;
 redhat)
    if test -f /etc/whitebox-release ; then
